Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finalize Conan v2 support #2587

Merged
merged 2 commits into from
Feb 7, 2024
Merged

Finalize Conan v2 support #2587

merged 2 commits into from
Feb 7, 2024

Conversation

wagoodman
Copy link
Contributor

@wagoodman wagoodman commented Feb 2, 2024

#2461 was merged into a feature branch in order to incorporate changes (the original PR was not writable to maintainers). This PR makes the following alterations:

  • decomposes the parseConanLock function to pass linting
  • generates a new JSON schema
  • adds tests around the new V2 conan lock format

Most work here is from @houdini91 on #2461

* conan lock 2.x requires field support

Signed-off-by: houdini91 <mdstrauss91@gmail.com>

* PR review, struct renaming

Signed-off-by: houdini91 <mdstrauss91@gmail.com>

---------

Signed-off-by: houdini91 <mdstrauss91@gmail.com>
@wagoodman wagoodman added the changelog-ignore Don't include this issue in the release changelog label Feb 2, 2024
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@github-actions github-actions bot added the json-schema Changes the json schema label Feb 2, 2024
@wagoodman wagoodman marked this pull request as ready for review February 2, 2024 23:11
@wagoodman wagoodman requested a review from a team February 2, 2024 23:11
@houdini91
Copy link
Contributor

Awesome thanks for getting this to the finish line

@wagoodman wagoodman merged commit c61f59e into main Feb 7, 2024
11 checks passed
@wagoodman wagoodman deleted the conan-ref-support branch February 7, 2024 13:24
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
* Add support for conan lock v2 (anchore#2461)

* conan lock 2.x requires field support

Signed-off-by: houdini91 <mdstrauss91@gmail.com>

* PR review, struct renaming

Signed-off-by: houdini91 <mdstrauss91@gmail.com>

---------

Signed-off-by: houdini91 <mdstrauss91@gmail.com>

* decompose conanlock parser + add tests

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

---------

Signed-off-by: houdini91 <mdstrauss91@gmail.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Co-authored-by: mikey strauss <mdstrauss91@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-ignore Don't include this issue in the release changelog json-schema Changes the json schema
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants